Include glib-object.h, Add G_BEGIN_DECLS/END_DECLS to

Wed Jan  9 11:29:44 2002  Owen Taylor  <otaylor@redhat.com>

	* Makefile.am (s-enum-types-h): Include glib-object.h,
	Add G_BEGIN_DECLS/END_DECLS to gdk-pixbuf-enum-types.h. (#68325,
	Mikael Hermansson)

	* *.h: G_BEGIN_DECLS cleanups.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index cac8131279dee12c4bced908089863c67edec736..bcbf2a1860d10a55ae639af6895ebcca7828ecc9 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jan  9 11:29:44 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * Makefile.am (s-enum-types-h): Include glib-object.h,
+       Add G_BEGIN_DECLS/END_DECLS to gdk-pixbuf-enum-types.h. (#68325,
+       Mikael Hermansson)
+
+       * *.h: G_BEGIN_DECLS cleanups.
+
 Tue Jan  8 10:58:04 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk-pixbuf-util.c (gdk_pixbuf_saturate_and_pixelate): 

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 8f5062f52f294abbb003a8c0c07bed588d20664f..527c1d1656188d75ac93b35659d68824bed1cd85 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -290,10 +290,10 @@ $(srcdir)/gdk-pixbuf-enum-types.h: s-enum-types-h
 
 s-enum-types-h: @REBUILD@ $(gdk_pixbuf_headers) Makefile
        ( cd $(srcdir) && glib-mkenums \
-                       --fhead "#ifndef __GDK_PIXBUF_ENUM_TYPES_H__\n#define __GDK_PIXBUF_ENUM_TYPES_H__\n" \
+                       --fhead "#ifndef __GDK_PIXBUF_ENUM_TYPES_H__\n#define __GDK_PIXBUF_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
                        --fprod "/* enumerations from \"@filename@\" */\n" \
                        --vhead "GType @enum_name@_get_type (void);\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
-                       --ftail "#endif /* __GDK_PIXBUF_ENUM_TYPES_H__ */" \
+                       --ftail "G_END_DECLS\n\n#endif /* __GDK_PIXBUF_ENUM_TYPES_H__ */" \
                $(gdk_pixbuf_headers) ) > tmp-gdk-pixbuf-enum-types.h \
        && (cmp -s tmp-gdk-pixbuf-enum-types.h $(srcdir)/gdk-pixbuf-enum-types.h || cp tmp-gdk-pixbuf-enum-types.h $(srcdir)/gdk-pixbuf-enum-types.h ) \
        && rm -f tmp-gdk-pixbuf-enum-types.h \

diff --git a/gdk-pixbuf/gdk-pixbuf-io.h b/gdk-pixbuf/gdk-pixbuf-io.h
index b66bcaf08b0ef24d0b32a4d1e85d3acda107eacb..15e9de0a0f48c01c661282b0ffd54936b6623f2a 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-io.h
+++ b/gdk-pixbuf/gdk-pixbuf-io.h
@@ -33,9 +33,7 @@
 #include "gdk-pixbuf.h"
 #include "gdk-pixbuf-i18n.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 \f
 
@@ -94,8 +92,6 @@ gboolean _gdk_pixbuf_load_module (GdkPixbufModule *image_module,
 
 \f
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif

diff --git a/gdk-pixbuf/gdk-pixbuf-loader.h b/gdk-pixbuf/gdk-pixbuf-loader.h
index eea72f30d8428b268d57918333ab1a3049f10b22..bacaf9d38cbd8a1c8c05cec8577dfb70fbc1dd48 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-loader.h
+++ b/gdk-pixbuf/gdk-pixbuf-loader.h
@@ -26,9 +26,7 @@
 #ifndef GDK_PIXBUF_LOADER_H
 #define GDK_PIXBUF_LOADER_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 #define GDK_TYPE_PIXBUF_LOADER            (gdk_pixbuf_loader_get_type ())
 #define GDK_PIXBUF_LOADER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoader))
@@ -79,8 +77,6 @@ gboolean             gdk_pixbuf_loader_close         (GdkPixbufLoader *loader,
                                                       GError         **error);
 
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif

diff --git a/gdk-pixbuf/gdk-pixbuf.h b/gdk-pixbuf/gdk-pixbuf.h
index 7c616f8dd6c6a3677c5114e48c64ae5367a0374e..900be4f9e066682c4e2d4cae8820be8a51af3bb8 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf.h
+++ b/gdk-pixbuf/gdk-pixbuf.h
@@ -30,9 +30,7 @@
 #include <gdk-pixbuf/gdk-pixbuf-features.h>
 #include <glib-object.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 \f
 
@@ -291,13 +289,11 @@ G_CONST_RETURN gchar * gdk_pixbuf_get_option (GdkPixbuf   *pixbuf,
 
 \f
  
+G_END_DECLS
+
 #include <gdk-pixbuf/gdk-pixbuf-loader.h>
 #include <gdk-pixbuf/gdk-pixbuf-enum-types.h>
 
 \f
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

diff --git a/gdk-pixbuf/gdk-pixdata.h b/gdk-pixbuf/gdk-pixdata.h
index 4a04a4b8071fde38c655a154d433d50bc1abc8a3..58b0e226a43ca20da8297aa0c4ef5b387b7bb488 100644 (file)
--- a/gdk-pixbuf/gdk-pixdata.h
+++ b/gdk-pixbuf/gdk-pixdata.h
@@ -21,9 +21,7 @@
 
 #include        <gdk-pixbuf/gdk-pixbuf.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /**
  * GDK_PIXBUF_MAGIC_NUMBER:
@@ -167,9 +165,6 @@ GString*    gdk_pixdata_to_csource  (GdkPixdata             *pixdata,
                                         GdkPixdataDumpType      dump_type);
 
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_PIXDATA_H__ */